Revert 082bf19..d92c5c2

This rolls back to commit 082bf19ec3dc04d3d0e909a38561d8e1316d3b59.