Revert 05b61b2..67b8f91

This rolls back to commit 05b61b2d1afd2bc43a6638f01fceba67ab8fbd97.