Revert white-space changes and make backward compatible