Revert 47ab7da..9dc9130

This rolls back to commit 47ab7da7c537d3fd4263f6e57dd47e123c9222ef.