Revert 29f15b8..be2afd4

This rolls back to commit 29f15b8b6d275ee39ad6e21c4efd1776b2a57f27.