Revert c531669..89ee023

This rolls back to commit c531669612f6a0c685032c90636956945f7ea840.