Revert 6d3cdc9..4fd370e

This rolls back to commit 6d3cdc9aba9033d037ea9914d4b7c28239db0468.