Revert f3f1b02..2ffe251

This rolls back to commit f3f1b02ceb3f6f08443186f923ed6a753c329ac6.