Revert 3ff9815..b364adb

This rolls back to commit 3ff98158eaca180b20432ff59d4f69b006e51625.