reverting Merge #601 closes #663