Revert d6a633c..3f312f7

This rolls back to commit d6a633cadf525e83d9e83892faffc7a78fe7d125.