Revert mess

This reverts commit a9169fd600d44c9a9856b4e58749ecc0232e0abc.