Revert "Implement bug 278, comment 1 - better version of EXTS"