Reverting 383e22d based on a previous design discussion.