Minor revert and proper fix