Reverting buggy commit 1b8a6ce56d05e9f8b7fc6c95ca58ab03fe164b8b