Revert f0ed688..eedabff

This rolls back to commit f0ed688cbe42c965ea462e1f8d44a5e6bb78d4b2.