Revert 7b7c5b9..c17513a

This rolls back to commit 7b7c5b9a1ea76cbe246cdd9ea22865320c6e4f51.