Reverted earlier commit after discussion.