Reverted commit #d29ceba1fb897c5a77029fdc2e81f4bd53eee65b for issue #402