Revert 95dbb1f..a2e84c0

This rolls back to commit 95dbb1f27d54c902fd4629c5cb7b74bbfb735c81.