Revert f60d8bc..472419d

This rolls back to commit f60d8bcf9740cdf5823a230631d928e8de26333c.