Revert 832904f..9f7de24

This rolls back to commit 832904ff1eb5ac42f0a2157698509e3ab813739c.