Revert 44ffbef..4243356

This rolls back to commit 44ffbef097ec491258f85a222aae9711573f0544.