Revert 475497a..5256bdd

This rolls back to commit 475497a33a8b8eb038ba683d3da7b61968d78be2.