Revert acb3592..803060a

This rolls back to commit acb35927de739aa78be68e32813cd82a23e4ab35.