Revert "get ready for merging master-oldam"

This reverts commit 822a32954dffe36e2294633a1e2ecc7945d7932f.