Revert "Try out PK's suggestion"

This reverts commit 7844710c688bf99b4cca3f16962cac8a91c2c6f3.