Reverted experimental edits