Revert 3dd0ddb..1d6741e

This rolls back to commit 3dd0ddb3029ce231335150954c547ae498e51b6b.