Remove temp fix

This removes the temporary fix introduced by #925 (see #928)