Revert 874fb98..d2de97a

This rolls back to commit 874fb984f849d4adaadf26885315c9f2093fc9ca.