Revert "Also.. watch out for these."

This reverts commit 46c9e7389d92ec4abf04ff96d026ad01de501202.