Disable some code again because it does not work as intended.