Revert 9305f12..37d05f8

This rolls back to commit 9305f12392c0c60599a630a51b85fc191acad798.