Revert 5085b1f..5d4f46c

This rolls back to commit 5085b1f8d30852aa64dad5f225f9a3f757412d7b.