v1.0.3.160 - revert #155; fixed properly in #159