Revert 2ffe87e..1ffb107

This rolls back to commit 2ffe87eea31166afa3eeff25790f58c3dde3b9e6.