reverted BEAM-1648