Revert a7ef4a3..1b6e5f7

This rolls back to commit a7ef4a34cdc3084539f4c23db8f75b6581032b6f.