Revert 1434450..8f382be

This rolls back to commit 1434450336c711a92876032df3947b01c37320eb.