Remove the existing flag, add a changelog entry for the final
feature implementation, and refactor the associated specs