Revert "merges trevorgunn manually"

This reverts commit 134a93e032c2b3adb08c84c6acf0f14702f8eb89.
Changes to next level link (pull request trevorgunn)

merges manually