Revert 8ec3cf7..82e6451

This rolls back to commit 8ec3cf7edfe17106e02f4f91d3a512a938cfad71.