Remove regressive code that sneaked back in