Revert 8503fb7..c88ea3c

This rolls back to commit 8503fb71c18c4a66de0f999f3a525f090b698751.