Revert "Remove upper bounds and close #46"

This reverts commit f956674d254fb4e46f6f4d59379bc92e56712c8e.