Reverting to figure out if it's a problem in python or the compiler for now. This reverts commit 885a05f4.