Revert 2d3ea16..dd00029

This rolls back to commit 2d3ea168b924f5834f1f05dfa2319d3a28e33f60.