Revert f01cd1e..0199d46

This rolls back to commit f01cd1e0d1d406fd509a29a34b3e5019ca2fa6b6.