Revert f041cfb..f8ad6a3

This rolls back to commit f041cfb367e2436b7d579b3840bbc719b957a3ee.