Revert "breaks build. disabed for now"

This reverts commit ea6ef16014603714613daeedfbe40482963cadb8.