Revert 1553eb1..d16b245

This rolls back to commit 1553eb1f1bb72dde7217498d815b37d334de297b.