Revert f29e55d..a10d9b8

This rolls back to commit f29e55da6e7bc9c1b42ce9ff4b3e10d10b03ba52.