Reverting part of cafff29 (see #187)