Revert r18762 after a report that segfaults still occured.
Support for GCC6 will be pushed to A22. Refs #4053