Reverted unfinished changes.