Revert 4fca88e..77feb8e

This rolls back to commit 4fca88e6e33445287e24a7170baaf7c443cf99af.