This reverts commit a6d8b28221.
a6d8b28221
Not sure why these aren't being detected on master right now - they should be...