Revert 32b9e4f..7a2e00a

This rolls back to commit 32b9e4f4f7d352927aeb7413ea4cef6c2a220f5d.