Revert 228499a..340a7c0

This rolls back to commit 228499a6a0ea268f1d30d6f63dd1c31371da1652.