Revert 31be926..0047c74

This rolls back to commit 31be926f761864b3deb842922acd97359afebfa5.