Revert 74448ee..40be815

This rolls back to commit 74448ee478b7ea5398272281ddc80ece6ef5d431.