Revert c2b35d8..bb40128

This rolls back to commit c2b35d81c6ec5c6ff8a3de56926826edc3d91830.