Revert b6eeed3..436b7bb

This rolls back to commit b6eeed367c038908e776832895c16a6bd6f600ca.