Revert to clean version

Revert a41d607..0eb7297
This rolls back to commit a41d607ed39360812c1b78727d1fce39cb53649c.