Partial revert of commit fdc44c5a72278afe2360631195d0fd5badcabf94
Partial revert of commit fdc44c5a72278afe2360631195d0fd5badcabf94

Actual fix was in commit a623f1eea320bf4a3252980936a1f3c7f526e695

adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp,adfernandes/pcp