Essentially, revert ff160e08.
closed via commit 0a1c3daf
mentioned in commit isuruf/pytential@ef891173
mentioned in commit 8e4a826c
mentioned in commit pytential@48dc2a66