Revert e62981a..e332caf

This rolls back to commit e62981a0684398c7d47d804d05f182fa20b469be.