Revert 3bc97ac..fe751ef

This rolls back to commit 3bc97ace2e212bc34bffc22a75f0f545e7885f00.