Partially revert #2922

This is causing a bug in 1.2 (see #1831 and #1834) and was working fine anyway.