Revert 92a2a2a..254484a

This rolls back to commit 92a2a2aef124b09dc12d3c9da76852c1435c0fed.