Revert "Merge pull request #781 from pilif/two-lined-pygmalion" to solve #2317

This reverts commit 4954335b64e294923d64c4a9208e732bb9399268, reversing
changes made to 2a43c5eebdb1976277d760b435045ac4e7c95e61.

Solves issue #2317 until a better solution is found.