Revert 2b0a416..e05cfbf

This rolls back to commit 2b0a4165ed7bf505159a0fdc280dd817ddf3deed.