This reverts commit b92693ac. I've made a silly typo in the condition. Will reapply the corrected version.