Bad merge, re added removed functions.