Revert "Merge pull request #1880 from cerupcat/master"

This reverts commit 2d62d2e13f68bc02646e756dcaa40675e6a73823, reversing
changes made to eb45d5946f7e9ff2806b79d31a8ec43c1aa0b6b2.