Authorship of this commit was incorrectly reset when merging. As such, it is being reverted to fix this problem. This reverts commit dc6dc89779.
dc6dc89779