Remove the non BASE_ONLY implementation.