Revert 83606c0..cd81623

This rolls back to commit 83606c0e40622f073972f18c637fd472f60b94e5.