Revert the hack

This reverts commit 6bb8344dd9b70fe680e6a49739ace05e6fa8635d.