Revert "Merge pull request #1139 from bbodi/devel"

My sincerest apologies, but this PR wasn't tested enough,  nor should I have pulled it in without dom96's consent.