Revert #221 as it is causing more problems