Revert 4a92828..5a99fec

This rolls back to commit 4a928282ee7fc3db42b8aebfefe5a339fcfd2612.