This reverts commit 4172d59dbe547334e3b203ad3445b039b7007915. due to a bug that needs to be investigated closes #1519