Revert fca603b..10eeb7a

This rolls back to commit fca603b92af34baa91dd893643e395b8035f865b.
Version 1.9