Revert d34c5e3..b989ade

This rolls back to commit d34c5e3d4211a566de33875dbe2b99620a03cb58.