Simplified code

git-svn-id: http://svn.code.sf.net/p/mrbs/code/mrbs/trunk@2808 25f7e783-145e-4f2d-a9f8-dd7182bfe9c7