Revert "Quick hack to remove namespace and pools from whole_frame_alignment"

This reverts commit caea1dba5c9259e5fe283614c04a29c3158e896c.