Re-apply r15878 as it wasn't the cause of the problems