Revert "Register Layout"

This reverts commit 5a1cb1fdf41222400b2dbd824be7507f2866a9bd.