Revert 71c834f..98e58c2

This rolls back to commit 71c834f9b4ef517597559e66fc9ab9eb819bfbcc.