Revert 543066f..3dd8830

This rolls back to commit 543066f2fdf9a1c09eaa137f046445a1649e0ba0.