This reverts commit 62ab15ff. Multiple commits were unintentionally squashed into this one. Reverting so each of them can be pushed properly.