Revert 1333f6d..e8eedc6

This rolls back to commit 1333f6d9d2019778b080b9fc5ab36cc0f5e163ca.