Some minor cleaning up [ci skip].
Reverting commit f2d5af4794056ab99a47cdb385835aafa820e7d1 (#514) [ci skip].