Revert 373ce4f..a19a739

This rolls back to commit 373ce4f461739b86c3ab2084670b626447e772cc.