Revert fcc5ba0..ad88aeb

This rolls back to commit fcc5ba0473bb01d630d31e7f1d4973fcc78234ad.