Revert bc2275e..eff8474

This rolls back to commit bc2275e41c04920efe30c4ee71955dd17575eb6f.