Revert 409d1aa..8e0ce3e

This rolls back to commit 409d1aa80e439aa1bfd061ecd19b58e0829cd8f8.