This reverts commit 49afba43.

This change was introduced in the masterFIP branch, but it can break many existing designs, so it is reverted.