Revert d0f597f..f5a4988

This rolls back to commit d0f597fc46b4f3f6b8dd06917121419ca648b190.