Revert 47b332c..6731901

This rolls back to commit 47b332caf659c68506c0255499d6f60d87d48248.