Fix for 1370 and 1371

This rolls back part of the change that fixed #1369