Undoing because there are more bugs that this was hiding, and this should not be deployed yet