Revert 7330341..452aae7

This rolls back to commit 7330341fba700af37e6a9f5c1e9476ba2bde70d6.