Reversion commit 1