Revert 540468d590cba1ca6003e59655fce85ef1d29a5b and fix comment