Revert 0890bcf..4c29916

This rolls back to commit 0890bcfd4441186862971c5bc1628f14b91110e4.