Revert 5119d79..e503e8d

This rolls back to commit 5119d79f8b4714e17fb23ea84fa7801ca71b896c.