Reverse af9895dac45fc932a1e2207c4c579d4f9d7fd33f (close #162, ref #132).