Revert 4fce82f..ee5102c

This rolls back to commit 4fce82f30e91bd876b350bc2b695298137ea4e9f.