Revert f881cb6..eb34bcc

This rolls back to commit f881cb62ea6bd4d04571351fc7f2d7a58435ce90.