Revert 2159fa6..6c91a2f

This rolls back to commit 2159fa6e59b5d2744fc4bd980de6a9f8daf63789.