rolling back smoking gun functionality to 2.3 version