Revert "Trying to bypass the conflict"

This reverts commit a39d62514b5746d2a3cc094f43c9c712b2e39864.