The original problems seems to have been fixed by #1133 (closed)
Essentially reverts 3c7e60b7 and closes #1175 (closed)
