Revert d038a16..3a138f6

This rolls back to commit d038a162bdb3d828955e136ea17e581005a8d712.