Revert "m"

This reverts commit 83d12cd5af926a02702ea30631f33369947f327c, reversing
changes made to 6443ea3f8a8bc71bcbdfea5ac91d51dde201b8d6.
.gitignore changes.