Revert dd10c92..be24fb1

This rolls back to commit dd10c92891cc27ac5e2d0544af42ac56b5c8a785.