Revert 1aa2d45..3bef603

This rolls back to commit 1aa2d451d9edc063122bfd7a88e5c104bed08017.