revert svn 1679 - fixes cp15 read/write timeout. Single stepping still broken.