Revert 2843e51..2588645

This rolls back to commit 2843e5193d2b79d3d6e881b7a19130f2d1d580fe.