Fixes changes reverted by thamlett