Revert 29745c8..a4190af

This rolls back to commit 29745c8639556a0a1e201632749128cfc2455d64.