Revert "Revert bad8e03..d403405"

This reverts commit ed930b48a37c16cf8889867942b6509e89576afd.