The current implementation was never meant to be more than a very temporary stop-gap and is frankly embarrassing.