Revert [50764d32f7] for now, breaks build and needs more work