Reverted stuff; fixing stuff.