Revert 9f37255..2007a99

This rolls back to commit 9f37255d9f4720916f2f8bb55da1955cec610555.