Safely re-introduced the change from SHA: dec541.