Revert 6bb89ac..52ea087

This rolls back to commit 6bb89aca32d33470371d17b223f72ab7b2e34480.