Even though its wrong, revert a recent change to restore old behavior

* i'll try to find a better fix in the meantime