Revert 7595d3e..c9a99ab

This rolls back to commit 7595d3e032f4df60c651c5e384d1b748da596e14.