Apply a change by Toomas Kiisk <vix@cyber.ee>: