Revert 504e233..84f75e3

This rolls back to commit 504e233c1102b1f5aadb0214e350c3aaa228474c.