Revert 58a4f10..6a43e8a

This rolls back to commit 58a4f10bff5c9fb419d0e0a0eff01875b9fa9f25.