eve-47 revert prototype change