Revert 351f8a2..a310073

This rolls back to commit 351f8a255e066ce00277cbbe0dc0af1b439a3603.