Revert 616bf4b..0db263f

This rolls back to commit 616bf4b82609d32b207ef5213eb6ea81bb51cef1.