This reverts commit 44a6bda1. I forgot to correctly attibute it to tarinduj. Fixing and resubmitting.