Revert dc05010..7173e24

This rolls back to commit dc05010b67ac39590e10c734e1d1697fae226659.