Revert accidental removal of code in 3a40a5e