Revert aed31b6..6238f64

This rolls back to commit aed31b6a86e07c57ef1c810a1975c3930dce45e5.