Revert 3576757..369f283

This rolls back to commit 3576757e9da1f62efb261cc4e92f6507c25099be.