Revert "Not working properly -> limits => broken others"

This reverts commit c1fce8ed8c97e2789e418771516df99d9a6b7544.