Revert 2b38623..1725600

This rolls back to commit 2b38623569ea07ec5dd4f0270389e0499ec94d6b.