Reverted commits 81c5127 and 0664fd1