Revert "MNLAO Updates"

This reverts commit db1adf88a5f81c63dfa28b1dca00572a918d3776.