Revert to the commit before I changed it with WL-3293