Revert b487506..70869bb

This rolls back to commit b48750695c1ac69e4f6de562f585538659d54169.