Revert 9bbf7a1..2b9871c

This rolls back to commit 9bbf7a1a8e839be97355ee56e91284d5d6079d8a.