Revert "Revert af409a0..aa47211"

This reverts commit c9008303b704155f208c408d9fa5966a7c8cf481.