Revert 397e941..2f5626b

This rolls back to commit 397e9417d5d3b8023303770801c3abb2d9cdbba8.