Revert 9d86bd2..fe63731

This rolls back to commit 9d86bd2c4d2d02f87061651092a9998d9c872dd3.
Last working master.