Revert 52c064e..9daf1c5

This rolls back to commit 52c064e179f112bce6d10a3c0bb3d904945ad06e.