Revert 7f13b69..f3e8fcf

This rolls back to commit 7f13b69936817c34bb01e18632360a3677d93f73.