Revert 60e5a32..c4d6677

This rolls back to commit 60e5a320c7cb9f7dae7afb7f12d2a4165f188e92.