Revert c33df99..a0b4023

This rolls back to commit c33df99998ab059328bb6042c11e1cf377b06d62.