Revert 8f6a830..e76ec2d

This rolls back to commit 8f6a830ea7c53832d9947d033178f00c847eebf7.