Revert f65e804..bc4479e

This rolls back to commit f65e80493d6e393d3b721f2bf1d3db6bf398f706.