Revert c4e71f7..0a5e373

This rolls back to commit c4e71f7a6e7da2d90ec9a2e099c73f21149bf5ce.