Revert to last good commit

This reverts commit 1b5b8c123678cfc0c586b99085837c61c16e457f.