Revert accb49e..79d8416

This rolls back to commit accb49e2f3958039307f6ba019aed846517f8711.