Revert f4eee3e..29202d1

This rolls back to commit f4eee3e08fca2c7f62d51dfb1ad24393e3e8db92.