Revert 3277318..d0553ec

This rolls back to commit 3277318e7956b3a496c0aeb13fe889c95d5b7258.