Revert 7f11229..547a902

This rolls back to commit 7f11229dcbdbf433dad234b8561440c09ea13a91.