BLD-811: Revert functionality.