This reverts commit efc359c231, as it is no longer needed. See: efc359c231 (commitcomment-15680107)
efc359c231
efc359c231 (commitcomment-15680107)