Revert 05af12e..17d4019

This rolls back to commit 05af12e62b8539d099510c6648ff01fa69ff1717.