Revert 9f0f38e..7c69420

This rolls back to commit 9f0f38e152e0f80d20aafd947f8485d394fe9b94.