Revert cfae740..519bb30

This rolls back to commit cfae7409db16a5bb49f0280680e11b0909b31f65.