Revert r24898 and fix yellow properly so that register is still read