Revert 8529507..426873b

This rolls back to commit 852950739c314ee3d22669a3b345684354f531a8.