Revert 78d52a7..d8232a3

This rolls back to commit 78d52a7ac141ddc5388a14264831e41fed974336.