Revert 70de238..c5feb6a

This rolls back to commit 70de238e0acc6983217204890340a43d8b42b3f5.