er... to be clear: with the engine changes on the way, i think that doing something hacky here is less atrocious 😃