Revert a breaking change, this will be implemented back though.