Revert fb2ba5f..d7208fd

This rolls back to commit fb2ba5fc9e29960f0f49bcee8dcc5fff8999cee5.