Revert 16afbbd..6ae4093

This rolls back to commit 16afbbd0c520305bc4236f670fc2bf1509c56c4d.