Revert 6f5139a..31c39ef

This rolls back to commit 6f5139a53f378e6401f777f5862015830e408353.