Revert "Experimental bug fixes"

This reverts commit 3838780edbab33b83888c7876714800777abff45.