Per discussion in IRC we would like to have building-blocks team approve this if needed, my refactor is much more maintainable.