Manual revert (copy-pasta) from commit 35df0f0 since git is annoying