Revert 524877e..8824d23

This rolls back to commit 524877ed9e7687198b08169fb73a2ef61d079a40.
xcuserstate