Revert d92b95f..298ba4a

This rolls back to commit d92b95f502286a1be31be478ad48d20b8b7a6baf.