#914: Revert identical to previous version