Revert YAGNI API :boom: