This change must be reverted (it is reverting #206)