Revert "Revert dcb8d6e..6aa1b5e"

This reverts commit 929cf4e1c1339ebdf8ebc1eb7c99b6dbddef4c90, reversing
changes made to a45d7e5dbc411261d9576959f9430d613a79806f.