Revert "Merge branch 'bounded-control'. This fixes #1037."

This reverts commit 943047a24583ae778405b0cd500cbb3628674a12, reversing
changes made to 96a59a8a63b58cb384801efef7e03085517223f9.