Changed how we access the SWAP layer (again).