Revert "Revert da7a2ed..ed77f76"

This reverts commit c6eaa50dc39fde567cab0659942bc3617f4ad243.