Revert d79535d..fc5418f

This rolls back to commit d79535db3492fef9c8ba0dd2476a3ad65cf0b3ab.