Revert a31ff6b..34ec21a

This rolls back to commit a31ff6b9159c407520956ff1698cb406d9fcecc0.