Revert 400ea2b..8cf16e2

This rolls back to commit 400ea2b884fb033fe67a5162e837814253dc8c3d.