Undoing part of #93eb9d50829f61b3