Revert a779379..48649b7

This rolls back to commit a77937966989115b379c271c0d67e91de4b1a435.