Updated to block 27975 to prevent forking