Revert 866fb66572da23e27ccb9ee54aaec42a3811553a