Only going to do this in the master as it may affect scripts. This reverts commit 454f78e6. Conflicts: NEWS