Revert bfba614..ce7f5d8

This rolls back to commit bfba614b7ae97f95f9b47a6d13d32f5f2ce0b7b9.