Updated to match 7.x-3.x