Revert cd22c1a..b8264af

This rolls back to commit cd22c1a3b8e86c76a0b73283bb01bb3b3effd1de.