Revert 1722726..5e015a5

This rolls back to commit 17227269158ba5ddd5a7e7fb772f97cda51d08be.