Revert 78c5a20..24da50c

This rolls back to commit 78c5a20c24165576e1537b1fcb98b2fd1c4abc58.