Revert 83d1313..d128cf7

This rolls back to commit 83d13135032f0f85df85011eaa9216588e619db5.