Revert f379d33..35f60f3

This rolls back to commit f379d33cd87d6bd7e66dbef2fd484cb970a322e9.