revert commit fdd3e627d446539fe62bd7889cb8d7887c16a035, see #66