Revert e3484cd..8ac2b02

This rolls back to commit e3484cd97cd9415c127589b3fc2269d64335edaa.