Revert 79e5f7f..6850e1a

This rolls back to commit 79e5f7f928b198bbcc215ae7401b2945ab10b784.