Revert "X-bug"

This reverts commit 1a69808a70c7f66de65a232db0accc5b06854f48.