Revert 44d7fd9..2d2125f

This rolls back to commit 44d7fd997565c2447bebca7e367568997090895d.