Revert "Mike: commit to revert"

This reverts commit c093fb9609c0298adad6fb2648fabddf36dbc428.