Reverted unreviewed changes 904d2cc 6c67cf1 c76c80b6