revert change to screen specific code