Revert 6a255aa..19df050

This rolls back to commit 6a255aab0eeb654e4cd3d2dced5cd7ae3b1c315e.