Re-add pyramid support; sorry for last time :)

Change-Id: Id460375dcc5dce5039fac31963d81d820e82f88f