#4012 enbled again