Reverted back to broken state in case anyone is trying to use this to reproduce the bug