Revert 9d91a67..c33bd37

This rolls back to commit 9d91a67a7aaaf838c2bf195d24238a5c40ccc757.