Revert "Merge from thomaslevell"

This reverts commit 7ed19a2e7008155741778618c23c0027ba03d23e.