Revert 7bf97c4..15d92c7

This rolls back to commit 7bf97c427072032ebabdffc768c7e3afbc5b9dc7.