Revert 8ca45e3..0f9a298

This rolls back to commit 8ca45e34f4c6e89a64144c420eaa1c671ee22740.