Revert 93c5aa9..74679ec

This rolls back to commit 93c5aa99949e359558e6bca4787a4d82babc5a5c.