Revert e696063..5d7343c

This rolls back to commit e696063b064acf51a67c540774777e80c5baa7bf.