Revert "Revert 667d092..1677b63"

This reverts commit b43562dcb7a6685f485d83b6708ebf6ffc7346b6.