Revert 747cd76..7612a40

This rolls back to commit 747cd7650b967bb397ac98ac1705a87426f6e433.