Revert integrate #234 (accidentally created branch from the wrong head)

This reverts commit 29c67466c90bd5abe5bf721aea503d2862d3601c.