Revert "Merge commit 'fb5cb4e' into bam6-pyramid"

This reverts commit 879c31ee90719a14193c73022547ae5ff4111914, reversing
changes made to 4ab6078eeed9e3887a29dcbd9c351a81f9c5a0d5.