Revert merge branch 'future' into 'master'

Reference JIRA CB-3288

This reverts commit 51901bd9f22127ca283df5fa4e06611cbb59359b, reversing
changes made to 72cca5ec4f203dc18802b99f672f67b71817280d.