Revert 0d44823..9d94958

This rolls back to commit 0d448234781a768db60b322d21abd58364e3c508.