Revert 36f10a3..1abb135

This rolls back to commit 36f10a37cfde50508d98b3beb245a6eb3b69e285.