revert the unnecesary workaround introduced in e1633d604fe62fae79fd7bf9865f8b7433a7c9c8